Update for Emacs 22.1.

diff --git a/debian/changelog b/debian/changelog
index 3fecde7ef7c455ec8a48460a51a360e6ba7b8136..2386a1704beff19d10e049153ab3d6c27820efce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+emacs22 (22.1+1-1) unstable; urgency=low
+
+  * New upstream release. (closes: #427279) [rlb]
+
+ -- Rob Browning <rlb@defaultvalue.org>  Wed, 04 Jul 2007 23:05:33 -0700
+
 emacs22 (22.0.99+1-1) experimental; urgency=low
 
   * Update to 22.0.99.

diff --git a/debian/copyright b/debian/copyright
index c94fe0b5baf5728160131fc6ab2792f8fa4e9cb7..bb566c6a4219770ef736691e6541d5f39c7ac772 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Tue, 16 Dec 1997 00:05:45 -0600.
 
 This is the original source archive:
 
-  prep.ai.mit.edu:/pub/gnu/emacs/emacs-22.0.99.tar.gz
+  prep.ai.mit.edu:/pub/gnu/emacs/emacs-22.1.tar.gz
 
 Please see /usr/share/doc/emacs22-common/README.Debian.gz for a
 description of the Debian specific differences from the upstream

diff --git a/debian/dfsg-splitter b/debian/dfsg-splitter
index cd2c9f0d93f476b3a460d3a623e7053d81453066..85d1b30e3bee819d67b55a006a8767b060dd8291 100644 (file)
--- a/debian/dfsg-splitter
+++ b/debian/dfsg-splitter
@@ -7,9 +7,9 @@ set -x
 # run the script.  The resulting two orig.tar.gz files will be placed
 # into a new ./split-tmp directory.
 
-emacs_archive_name="emacs-22.0.99.tar.gz"
-emacs_dir="emacs-22.0.99"
-emacs_version="22.0.99"
+emacs_archive_name="emacs-22.1.tar.gz"
+emacs_dir="emacs-22.1"
+emacs_version="22.1"
 emacs_major="22"
 deb_src_rev="1"
 

diff --git a/debian/patches/avoid-fakemail-mail-loss.diff b/debian/patches/avoid-fakemail-mail-loss.diff
index 864aba602d06fcb0fed8ed0e0e75e3e9f9aeeaeb..ba1f7641147da124e200acc2f2334a9d3c056bf6 100644 (file)
--- a/debian/patches/avoid-fakemail-mail-loss.diff
+++ b/debian/patches/avoid-fakemail-mail-loss.diff
@@ -75,7 +75,7 @@ Index: sid/lisp/gnus/message.el
 ===================================================================
 --- sid.orig/lisp/gnus/message.el
 +++ sid/lisp/gnus/message.el
-@@ -4027,7 +4027,12 @@
+@@ -4025,7 +4025,12 @@
                                     "/usr/lib/sendmail")
                                    ((file-exists-p "/usr/ucblib/sendmail")
                                     "/usr/ucblib/sendmail")

diff --git a/debian/patches/fix-vc-path.diff b/debian/patches/fix-vc-path.diff
index b0fb4d88d25c50f7eb6b2c6f054d2d8119a3da90..63bf516cb019cc57bf48e471dca36ffb98d62b76 100644 (file)
--- a/debian/patches/fix-vc-path.diff
+++ b/debian/patches/fix-vc-path.diff
@@ -6,7 +6,7 @@ Index: sid/lisp/vc-hooks.el
 ===================================================================
 --- sid.orig/lisp/vc-hooks.el
 +++ sid/lisp/vc-hooks.el
-@@ -73,8 +73,8 @@
+@@ -75,8 +75,8 @@
    :group 'vc)
  
  (defcustom vc-path

diff --git a/debian/patches/handle-dfsg-split.diff b/debian/patches/handle-dfsg-split.diff
index f17bf9f86cd0d600fc785174954678ef83d8bf56..c2477082c028e6ab87b4f9bd827696f0e10b3b76 100644 (file)
--- a/debian/patches/handle-dfsg-split.diff
+++ b/debian/patches/handle-dfsg-split.diff
@@ -482,7 +482,7 @@ Index: sid/configure.in
 ===================================================================
 --- sid.orig/configure.in
 +++ sid/configure.in
-@@ -3306,7 +3306,7 @@
+@@ -3305,7 +3305,7 @@
  
  AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \
        man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in \

diff --git a/debian/patches/misc-unseparated.diff b/debian/patches/misc-unseparated.diff
index d489b1b52614302fe71d552cf34a3f29daea09f1..53942daa8224238df7a3a6c945575af3f611419d 100644 (file)
--- a/debian/patches/misc-unseparated.diff
+++ b/debian/patches/misc-unseparated.diff
@@ -59,8 +59,8 @@ Index: sid/etc/NEWS
 ===================================================================
 --- sid.orig/etc/NEWS
 +++ sid/etc/NEWS
-@@ -38,6 +38,11 @@
-    http://www.emacswiki.org/cgi-bin/wiki/PythonMode
+@@ -35,6 +35,11 @@
+ ** cua.el, cua-mode.el: remove old versions.
  
  \f
 +* Debian specific changes to Emacs